Re-enable deprecation guards

diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index fd04e689c40b386802dfe4fe58f1c219ebf2edd2..a2589c27f3f1993c7f6bad43e843e2487741d065 100644 (file)
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "gtklayout.h"
 
 #include "gdkconfig.h"

diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index 61ba27f6e9d5319b57d5a0b1478036c8a8509334..c2159f5133902660a4026e0802249c1f07391b08 100644 (file)
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -94,7 +94,7 @@ void           gtk_layout_get_size        (GtkLayout     *layout,
                                           guint         *width,
                                           guint         *height);
 
-#ifndef GTK_DISABLE_DEPRECATED
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 
 GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout     *layout);
 GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout     *layout);

diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 573910dcdc7354b424f303843eda4f05721c1d1c..7f7445f4d25f76a3e5dec5692a2d1d66b9aa89f7 100644 (file)
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -26,9 +26,8 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkviewport.h"
-#define GTK_DISABLE_DEPRECATED
+
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtktypeutils.h"

diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index c1d9ce4307e3e20b908702974564d69f73cb814f..686531045556ea8de5a9c9ad20fcf2ad9b411853 100644 (file)
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -75,7 +75,7 @@ GType          gtk_viewport_get_type        (void) G_GNUC_CONST;
 GtkWidget*     gtk_viewport_new             (GtkAdjustment *hadjustment,
                                             GtkAdjustment *vadjustment);
 
-#ifndef GTK_DISABLE_DEPRECATED
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 
 GtkAdjustment* gtk_viewport_get_hadjustment (GtkViewport   *viewport);
 GtkAdjustment* gtk_viewport_get_vadjustment (GtkViewport   *viewport);